removed js hint
updated glyphicon reference
Merge branch 'master' of github.com:sweatercomeback/dieseltruckhunt

Conflicts:
	app/styles/main.scss
Merge branch 'master' of github.com:sweatercomeback/dieseltruckhunt
Merge branch 'master' of github.com:sweatercomeback/dieseltruckhunt

Conflicts:
	app/views/main.html
gitignore
relative path of duckhunt dog