init
Merge branch 'master' of github.com:HerculesGeeker/PopStar

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
update