gallery is in progress
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza
gallery is almost done, ajax photo loader left to do
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	config/routes.rb
	db/schema.rb