little cleaning
Merge pull request #16 from mplaza/paulbranch

Merge pull request #15 from mplaza/master
Merge branch 'master' of github.com:mplaza/veteranshowcase
Merge pull request #17 from mplaza/paulbranch

little cleanup
merge conflicts resolved
adding scrapers
Merge pull request #18 from mplaza/paulbranch

added foundation, styling with block grid
Merge branch 'master' of github.com:mplaza/veteranshowcase
fixing nokogiris
Merge pull request #19 from mplaza/paulbranch

select boxes for filtering
merging
Merge pull request #20 from mplaza/melabranch

Melabranch
admin permissions
Merge pull request #21 from mplaza/paulbranch

set up active model serializer, angular consumption
merging
Merge pull request #22 from mplaza/melabranch

Melabranch
fix controller
Merge pull request #23 from mplaza/melabranch

fix controller
Merge pull request #24 from mplaza/paulbranch

added search filter to admin page
resolved merge conflicts