Settings
Port number
Sync database
Remove proc
Merge branch 'master' of heroku.com:arcane-fjord-7034

Conflicts:
	static/app.js