added gitignore to master
ADDED: Local database v1 should be functioning
Merge branch 'master' of github.com:dcelik/MobileProtoFall2014-LoCo into localdatabase
Merge remote-tracking branch 'origin/master' into frontAPI
Merge remote-tracking branch 'origin/localdatabase' into frontAPI