fixed shit
Merge branch 'brian'
Updated the add services to client
Updated the login
Merge branch 'prettymenu' of https://github.com/CST4G/HealthAppSprint2b.git