Add postgresql for production in heroku, sql in dev
Merge branch 'master' into about_me_page

Conflicts:
	Gemfile
	Gemfile.lock
Modfy todo file
clean up unnecessary tests
Add test file for about me pages
Write initial test
Set up Guard
Update todo list