Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014
Merge branch 'master' of https://github.com/poneill00/tcube-jan2014