fixed secret_key_base problem; now works in production
server junk
Merge branch 'master' of https://github.com/lbochenek/urList

Conflicts:
	log/development.log