git init
Merge branch 'master' of https://github.com/fingnet/glosea

Conflicts:
	index.php
init