why's it always ask me to comit...
Merge branch 'master' of https://github.com/jguarni/CISC360Project1.git