augmented reality added
Merge branch 'master' of https://github.com/Bladtman242/sigb2013.2
merging øøhhh