(refactor) transfers logic to directives and factories, cleans up controller
Merge pull request #34 from TessMyers/develop

(refactor) transfers logic to directives and factories, cleans up contro...
Merge branch 'develop' of https://github.com/amber-storm/amber-storm into develop
Merging changes