CSC 1351
Merge branch 'master' of https://github.com/amenocal/LSU