enable deleting in albums and styling
Merge branch 'master' of github.com:mbaniasad/kindergarten-

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'master' of github.com:mbaniasad/kindergarten-

Conflicts:
	app/assets/stylesheets/application.css