Adding .gitIgnore
Merge github and git repos
Merge branch 'master' of https://github.com/pendulum101/DigitalJournal