ashley's first fork branch commit
ashley's second commit
Merge branch 'ashleys_fork' of https://github.com/Ashley-Waldron/tcube-jan2014 into Ashley-Waldron-ashleys_fork

Conflicts:
	coolfile.txt