changed a comment in the code
Merge remote-tracking branch 'upstream/master'
The gps now says searching for signal instead of false cordinates. I replaced the word experiment with project throughout the app.
I updated the buttons in the project menu
fixed buttons in layout-v11
removed file that I did not want to track
fixing git fetch and merge
fix git issue
fix merge conflicts
updated picture app
fixed merge conflicts
Fixed merge conflicts with deleting login dialog
made changes to interface
updated interface
a few more minor changes to user interface
fix git errors laptop
Merge remote-tracking branch 'upstream/master' into bd859
Merge remote-tracking branch 'origin/bd859' into bd859
fix merge issue
Merge remote-tracking branch 'upstream/master' into bd859