PREVIEW LABEL
Merge branch 'master' of github.com:aaronpang/hci
MORE LABELS
Merge branch 'master' of github.com:aaronpang/hci

Conflicts:
	prototype/prototype/MainViewController.m
Merge branch 'master' of github.com:aaronpang/hci
erge branch 'master' of github.com:aaronpang/hci
LINES