added new file
pulled some changes
Merge branch 'master' of https://github.com/ssowemim/Assignment1