merging files
Merge branch 'master' of https://github.com/snajun/test

Conflicts:
	app/index.html