Added goals view
Merge branch 'master' of https://github.com/asorge/mindfulnessjournal

Conflicts:
	mindfulness journal/mindfulness journal.xcodeproj/project.pbxproj
	mindfulness journal/mindfulness journal/Base.lproj/Main.storyboard