No more conflicts
Update misc.xml
Update app.iml
Update build.gradle
Update AndroidManifest.xml
Update strings.xml
Update styles.xml
Update db.py
cleaned up
moar content
added pics
update link
added ic_launcher
fixed ip
Update README.md
Merge branch 'master' of github.com:mantazer/Occupancy-Sensing-and-Visualization