add koala gem
add friends_controller
Merge branch 'master' of https://github.com/acan12/tracore

Conflicts:
	Gemfile