avoid creating admin on production
sorted conflicts in app/views/projects/index.html.erb
Merge branch 'master' of github.com:ardmore/website