add file test
Merge branch 'master' of github.com:vikstrous/peachfreeze

Conflicts:
	window.html