removed my_locals.py from tracking
Merge branch 'master' of https://github.com/eStation2/eStation2
Removed field in testing (sqlite error)