main controller changes
merged
Merge branch 'dev' of https://github.com/juancamiloestela/Rocket into dev
endpoints
deleted unused files