old files
Merge branch 'master' of github.com:MidnightDemon/tanuki

Conflicts:
	app/controllers/profile_controller.rb
	app/models/tanuki.rb
update merge
fixed merge
heroku config
heroku config
heroku config
heroku config
heroku config