From a25c57f0f4ad18fb1761f4dc4cdf6dea78d3b689 Mon Sep 17 00:00:00 2001
From: Meghan Heintz <msheintz@gmail.com>
Date: Thu, 2 Jun 2016 18:28:50 -0700
Subject: [PATCH 1/2] postgres installation guide for mac, windows IP (#571)

* postgres installation guide for mac windows IP

* postgres install guide for mac ip windows
---
 docs/installing_postgres.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/installing_postgres.rst

diff --git a/docs/installing_postgres.rst b/docs/installing_postgres.rst
new file mode 100644
index 000000000..3b37e8196
--- /dev/null
+++ b/docs/installing_postgres.rst
@@ -0,0 +1,17 @@
+PostgreSQL Installation Basics
+==============================
+
+.. index:: pip, virtualenv, PostgreSQL
+
+The steps below will get you up and running with PostgreSQL. This assumes you have pip and virtualenv_ installed. 
+
+.. _virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/
+
+On Mac
+
+Install PostgreSQLapp_ from the browser and move PostGresSQL into your applications folder. Then install PostgreSQL from HomeBrew_.
+
+	$ brew install postgres
+
+.. _PostgreSQLapp: http://postgresapp.com/
+.. _HomeBrew: http://brew.sh/
\ No newline at end of file

From 6b9c6cbe64245ef1850b8ab864804c019a848dcc Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@gmail.com>
Date: Thu, 2 Jun 2016 18:34:09 -0700
Subject: [PATCH 2/2] Add @dot2dotseurat to changelog and history

---
 CHANGELOG.md     | 4 ++++
 CONTRIBUTORS.rst | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76ba8fba5..0f8491530 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+##[2016-06-02]
+### Added
+- Added better instructions for installing postgres on Mac OS X (@dot2dotseurat )
+
 ##[2016-05-22]
 ### Added
 - Added instructions for copying backups from docker to host (@phiberjenz)
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2fda7c634..4e0bc3bc5 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -96,6 +96,7 @@ Listed in alphabetical order.
   Matt Linares
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
+  Meghan Heintz            `@dot2dotseurat`_
   mozillazg                `@mozillazg`_
   Pablo                    `@oubiga`_
   Raphael Pierzina         `@hackebrot`_
@@ -135,6 +136,7 @@ Listed in alphabetical order.
 .. _@ChrisPappalardo: https://github.com/ChrisPappalardo
 .. _@Collederas: https://github.com/Collederas
 .. _@ddiazpinto: https://github.com/ddiazpinto
+.. _@dot2dotseurat: https://github.com/dot2dotseurat
 .. _@dsclementsen: https://github.com/dsclementsen
 .. _@epileptic-fish: https://gihub.com/epileptic-fish
 .. _@eraldo: https://github.com/eraldo