before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/javascripts/app.js
before heroku push
heroku push with new accounts
Merge branch 'master' of https://github.com/Factor-X/awac