Merging.
Merge branch 'master' of https://github.com/jackybaltes/RoboCup-2014-Humanoid-League

Conflicts:
	humanoid_league_2014.tex
Fixed flow problems. Minor rewording. Fixed school description.