Merge remote-tracking branch 'upstream/master'
Add files for heroku
Renamed unicorn file
Make changes for heroku deploy
Add dependencies to css
Fix dependency typo
Move dependency to application
Remove depend, add asset-url
Add static about and contact pages
Merge working heroku master
Merge remote-tracking branch 'upstream/release-1' into release-1
Remove file that I would be adding back
Merge pull request #68 from dazm12/release-1

Heroku changes and static pages