andia template
home, user_show
user#index
login/logout navigation
Merge branch 'template'

Conflicts:
	Gemfile
	Gemfile.lock