fixed bug in serving order
clean
merged it up i think
?
fixing merge conflict
fixing merge conflict
Merge! MERGE
controller typos
fixed missing end
changes
Merge branch 'master' of github.com:Plummat/gaprojecttwo

Conflicts:
	app/controllers/main_controller.rb
merge
Adding Bookstrap rocket icons to our application
cleanup
cleanup
cleaning up
cleanup
cleanup
Changed icons on splash page to Font-Awesome icons. Lookin GOOD.
Merge branch 'master' of github.com:Plummat/gaprojecttwo