commit to pull
merge conflict in the storyboard resolved
merge
small refactoring of HEALMainViewController, moved all properties and IBActions to .h and renamed some things to make more sense