changes on front page
Merge branch 'master' of https://github.com/Fathalian/Guild

Conflicts:
	.idea/workspace.xml