Adds DS_Store to gitignore
Merge branch 'feature/devise' into develop
Add 12 factor gem
12factor
html2haml on devise erb files