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