Working on new features for user
conflict resolution
minor index fix
Update stream settings
fix popup menu bug
Add functionality to motion detection buttons
Add functionality to motion detection buttons
main page and buttons
fixed everythingsgit add .
Add directional keys for servo
Merge branch 'servo_keys'
merge conflicts
sexy main page
Merge branch 'master' of github.com:Renesau/brickcam
chris' changes