17:34
07:56
Merge branch 'master' of https://github.com/Thainq/heartconn

Conflicts:
	HeartConnect/HeartConnect/LoginController.m
12:56
15:24