ppl/power.. constructors
Merge remote-tracking branch 'origin/master'

Conflicts:
	LO43_Smallworld_Fall2014/LO43Project_Smallworld/src/model/People.java
	LO43_Smallworld_Fall2014/LO43Project_Smallworld/src/model/Player.java