shuffling files for deployment
added rmagick to gemfile
Merge branch 'master' into heroku-deploy
fixed merge errors from removing source file
added DS_Store to gitignore
added 12-factor gem to gemfile
Added Ruby version to Gemfile for Heroku.
Add gems and Procfile for Heroku.
Add unicorn files for Heroku.
Fix validation syntax error.
Remove atter_accessable will have to replace with strong params later.
Merge pull request #7 from kendallflutey/heroku-deploy

Heroku deploy