Updating template
Merge branch 'master' of github.com:bellycard/rolodex into modals

Conflicts:
	vendor/assets/javascripts/rolodex_angular/template/modal/window.ngt.haml
Merge pull request #38 from shayhowe/modals

Updating template