00:29
Merge branch 'master' of https://github.com/Thainq/heartconn
00:43
00:12
Merge branch 'master' of https://github.com/Thainq/heartconn

Conflicts:
	HeartConnect/ProfileController.m
Merge branch 'master' of https://github.com/Thainq/heartconn
2:
Merge branch 'master' of https://github.com/Thainq/heartconn
23:
00:28
Merge branch 'master' of https://github.com/Thainq/heartconn
00:28
19:31
19:58