Adressed a majority of the issues in Jerry's email
Merge branch 'master' of https://github.com/Paerhati/Teach2Learn