first commit
Merge https://github.com/asolanki/cs1501-final

initial merge