migrated stuff
Merge branch 'master' of https://github.com/alamana/CS-1501