Refactored
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git
Added functionality to incorporate the make friend command
Fixed conflicts in the datamapper