Adding profile functionality
Merge branch 'master' of https://github.com/slowteetoe/stacks_on_stacks

Conflicts:
	config/routes.rb