Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013

Conflicts:
	Hackathon2013/Hackathon2013/MyScene.m
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
changed textures to colors, added methods for draining
added drop method
started work on connectedComponents
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
Merge branch 'master' of https://github.com/titangate/LinkedInHackathon2013
changed textures to colors, added methods for draining
added drop method
started work on connectedComponents
calconnectComp
obstacle generation works, polygon finding doesn't
resolved conflicts
Nav mesh
Merge branch 'angela2' of https://github.com/titangate/LinkedInHackathon2013

Conflicts:
	Hackathon2013/Hackathon2013.xcodeproj/project.pbxproj
Last commit