m
Merge branch 'master' of https://github.com/jaaaaaaannn/projectJuly14

Conflicts:
	index.html
	projectJuly14