fixing things up
Merge branch 'development' of https://github.com/NathanWalker/ProXimity into Feature/RA-content