Fixed popover bug, added category sorting
Merged category sorting and popover fix
Merge pull request #13 from zestos/master

Category sorting + popover bugfix
Merge pull request #14 from margaretblue/master

popovers, uniq_by title
add two rspec tests; add splash page
Merge branch 'js_time'
add splash page and two rspec tests
Merge pull request #15 from JasonLev/master

Add splash page and two rspec tests
Non-minified bootstrap
Merge pull request #16 from zestos/master

Non-minified bootstrap
popover content, rm null images from index, button colors
popover content, rm null images from index, button colors
Merge branch 'popovermadness'