Fixed Heroku deploy
Fixed Heroku deploy
Removed some whitespace
Removed tab indent
Merge branch 'dev'

Conflicts:
	.travis.yml