initial commit
Merge branch 'master' of heroku.com:efficientcities

pulling to push
style fixes
merge conflicts
resolving more merge conflicts