update_1.0.7
Merge branch 'master' of https://github.com/CodeGeeky/catapp11

Conflicts:
	app/views/welcome/index.html.erb
update109