general.js file
main directive
Merge branch 'master' of https://github.com/sweatercomeback/dieseltruckhunt

Conflicts:
	app/views/main.html