Merge pull request #3 from odeanmaye/master

Added markup and controllers