test merge
Merge branch 'master' of github.com:Tykrael/annick

Conflicts:
	css/main.css
	js/main.js