Setting up repo for heroku
Merge branch 'heroku' into delicious_cake

* heroku:
  Setting up repo for heroku

Conflicts:
	.gitignore