Merge pull request #3 from Apelon-VA/master

pushing all the sprint 6 work to master
Merge pull request #4 from Apelon-VA/master

add .project to .gitignore so I don't accidently commit it
Merge pull request #5 from Apelon-VA/master

and ignore .settings