small changes to controllers, fix logic, clear test puts lines
fixes styling, font problems
Merge pull request #48 from lisavogtsf/master

corrects styling, font problem, adds error catching to api controller
fix merge conflict