start of controller
finished controller
Merge pull request #5 from austinbourdier/matias

Matias