Moving Kalendae css to project.scss
Adding sass cache to git ignore.
Updating phi-framework to use Grunt 4.0, RequireJS, jQuery 1.9.1, Bower and more.
Merge commit '1d4bfb91a8518dc04ed1be7fddc665fb121eacc4'

I do not know why I'm merging.
Merge commit '1d4bfb91a8518dc04ed1be7fddc665fb121eacc4' into practice-mgmt-tab

Merging new phi with branch.
replace old modal with new one
Merge pull request #9 from cerebralideas/modal

replace old modal with new one
Merge commit 'fffc17299df8389610bbac5bbb9873f758e9070f' into new-design
add missing semicolon
Merge commit '07ce924ce6fc078fd445c286d7c3e9ceb7eb8e48' into new-design
remove modals and add overlay
update main.js
Merge pull request #10 from cerebralideas/overlay

Overlay.js
Update overlay.js
wire up modals
update overlay.js
Merge commit '7d5d04769a4b2674968ace9920dff0991e7d0b08'

Merging changes to phi into phi-framework.