sources under my eclipse repo
Merge branch 'master' of github.com:PatrickStar1234/windward2014

Conflicts:
	src/net/windward/Windwardopolis2/res/MyAvatar.png