first commit
Merge https://github.com/Dirk7589/ECSE_426_2013