cleaned up app delegate
updated git ignore master branch
Merge branch 'master' into charlie