point 8 preparation
Merge branch 'master' of https://github.com/gogiel/hackkrk-api

Conflicts:
	app/controllers/functions_controller.rb