Test images
updated data
made variable private
changed flash.now to flash and changed render to redirct_to
Merge branch 'master' of github.com:Project-Loremaster/Project-Loremaster

Conflicts:
	db/development.sqlite3