Merge pull request #4 from kevinbuch/refactor

Refactor
Merge pull request #5 from kevinbuch/refactor

Refactor
added test png
refactored controllers to act as middleware