Merge pull request #1 from rmcmahon/master

get my shit numbnuts
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'master' of https://github.com/poneill00/tcube-jan2014
commit 2
Merge branch 'master' of https://github.com/poneill00/tcube-jan2014 into poneill00-master

Conflicts:
	coolfile.txt
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
meh
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014