initial grunt commit
more initial grunt commits
Merge branch 'master' of https://github.com/ykka/vagj

Conflicts:
	index.html
Merge branch 'master' of https://github.com/ykka/vagj