Emilios thingy
Emilio
Emilio
Merge branch 'master' of https://github.com/karcaw/cpts224_2014

Conflicts:
	nothing.c