Merge branch 'master' of github.com:the-hobbes/softwareEngineeringFinalProject
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringFinalProject into dev
Removed old java bits from ignore file
Brainstorming for avatars for characters