gitprobleem
Merge branch 'master' of https://github.com/lrnzzz/freeter

Conflicts:
	code/index.html
index
index