first commit
Merge https://github.com/jmaa46/assignment1