Merge branch 'master' of https://github.com/BreakApp/BreakApp into modal
changes
Merge branch 'master' of https://github.com/BreakApp/BreakApp into modal

Conflicts:
	app/views/break-view.html
modal builds
Merge pull request #16 from BreakApp/modal

Modal