sportsmate logo added
Merge branch 'dev' of https://github.com/Bergrebell/CyberCoach into dev
Merge branch 'dev' of https://github.com/Bergrebell/CyberCoach into dev
cycling achievements added
merge conflict in welcome controller solved