Initial commit
Merge remote-tracking branch 'origin/Jeremy'
updated git ignore to ignore Intellij files
Merge pull request #2 from JeremySDev/master

merge