Merge branch 'master' of git://github.com/afein/SoftEng
sync
Merge remote-tracking branch 'greg/master'