add files to gitignore
commit changes after pull
Merge branch 'master' of https://github.com/Alivebox/aliveTracker_ws
view change to commit
Merge branch 'master' of https://github.com/Alivebox/aliveTracker_ws