Initial commit
Prepare for Heroku!
this better work
Conflict my ass.