added unicorn server
added Procfile
/bin added to gitignore
Merge pull request #18 from christophwong/blessing-of-unicorns

Blessing of unicorns
a few but not all tests for journal entry controller have been completed
Merge pull request #20 from christophwong/partial_journal_entry_controller_tests

a few but not all tests for journal entry controller have been completed
Merge branch 'master' into alchemy-initial-setup

Conflicts:
	.gitignore