built code with grunt
removed index file
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gruntfile.js
	index.html
	package.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gruntfile.js
	index.html
	package.json