Merge pull request #23 from jasonalmaturner/master

Adding and modifying controllers