Second commit
Merge https://github.com/hsan93/Project2