Matches and Pictures now work together
Merge branch 'master' of https://github.com/blair-robot-project/Scoutmaster-9000-web