zadjii, May 24, 2013 - Mega commit of all the code I made for the NEST Demo. Comments are... lacking, to say the least.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RummageSailingPrototype/src/entities/Player.java
	RummageSailingPrototype/src/util/Images.java