- main.js correction
- Grunt Files
Grunt Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js