moar code
added index.html
hotfix
finished issue 53
merged
edit index.html again
edit 1 index.html
Merge branch 'test2'

Conflicts:
	index.html
Merge branch 'master' into testing

explain why this merge is necessary,