testing
Merge branch 'master' of https://github.com/Mothirajha/seotool into production

Conflicts:
	app/views/dashboard/show.html.erb
Merge branch 'production' of https://github.com/Mothirajha/seotool into production