First commit
Merge branch 'master' of github.com:boompig/csc309a3
Added gitignore