testing this thing out
Merge branch 'master' into feature1

Conflicts:
	index.html
Merge pull request #1 from ronaldinho180/feature1

Added