initial commit
Merge https://github.com/dmasood/comp2013