Frances saves the day
Merge branch 'master' of https://github.com/raymondzeng/tortoise

Conflicts:
	project.properties
	src/com/brown/tortoise/Beam.java