Update 18/06/2014
Revert "Update 18/06/2014"

This reverts commit 79c44a1c90c7d2744302e7d5a31357abfc2bd853.
Merge branch 'master' of https://github.com/BOFlaherty123/GymTrackerApp