gg
Merge branch 'master' of https://github.com/laviniaplatica/Test

Conflicts:
	Hercules.txt
Merge branch 'master' of https://github.com/laviniaplatica/Test