second commit
Merge branch 'master' of https://github.com/Andiiee/andiiees

Conflicts:
	index.html