still fixing some merge issues
clean
commits changes ebfore merge
more merge stuff
Controller cleanup
fixed bug in serving order
clean
merged it up i think
?
fixing merge conflict
Adding Bookstrap rocket icons to our application
cleanup
fixing merge conflict