removed trash files
 fixed previous bug
Merge branch 'l4dev' of https://github.com/joelferrier/spring-oslabs into l4dev
"include bugfixes"