test
Merge branch 'master' of https://github.com/balajee/high-5

Conflicts:
	htaccess