Merge branch 'master' of https://github.com/BreakApp/BreakApp into modal
Got rid of window. in the breakTimer function.
Merge pull request #12 from BreakApp/modal

Modal
Merge pull request #14 from BreakApp/timer

Got rid of window. in the breakTimer function.
changes
Merge branch 'master' of https://github.com/BreakApp/BreakApp into modal

Conflicts:
	app/views/break-view.html
modal builds