Updated git ignore
Merge branch 'master' of https://github.com/mbartling/Cal