Merge pull request #33 from rocketu/template-functions

template updates w travis ojala que
Merge pull request #34 from rocketu/template-functions

templates and functionality
Merge branch 'develop' of github.com:rocketu/mission-control into template-functions