Testing command line server
Testing command line server
Merge branch 'master' of heroku.com:vicpermits

Conflicts:
	Procfile
Latest test
Merge branch 'master' of heroku.com:vicpermits

Conflicts:
	Procfile
Trying express...