Changed my practice answer.
Miscellaneous fixes
Here's how it looks through git gui.
Note to self.
I hope this fixes most setup problems.
Oranges are 7!
Merge branch 'master' of https://github.com/lawrancej/COMP278-2014

Conflicts:
	practice.txt