SynchtpnizationPoint
Merge branch 'master' of https://github.com/braude-spring-2014/Project

Conflicts:
	Java Code/SGIServer/bin/server/database/Database.class