Updating template
Updating search form
Merge pull request #34 from shayhowe/forms

Updating search form
Simple alert
Clean up template
Merge pull request #35 from ajself/alerts

Simple alert
Adding labels
Merge pull request #36 from shayhowe/labels

Adding labels
Adding and cleaning up icons
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
Merge pull request #37 from shayhowe/icons

Adding and cleaning up icons
Merge branch 'master' of github.com:bellycard/rolodex into rolodex_accordion

Conflicts:
	vendor/assets/javascripts/rolodex_angular.coffee
	vendor/assets/javascripts/rolodex_angular/rolodex.coffee