Edited .gitignore file
Merge branch 'master' of github.com:jdeslangles/project2
Fixed test branch merging issues, minor layout changes