Initial Controller Code
Merge branch 'master' of github.com:HeartLine/heartline.github.com into controller

Conflicts:
	js/controller.js
fixed conflicts