commit
Merge branch 'gh-pages' of https://github.com/jtsanch/CS-247 into gh-pages
added M2 details