small change to test separate branches
Merge remote-tracking branch 'origin/master' into sean
conflict test sean
Merge remote-tracking branch 'origin/master' into sean
Merge remote-tracking branch 'origin/master' into sean
Treemap prototype up
Added treemap view
upvoteing claims (partial) login checks
change cctop to avoid collision
Merge remote-tracking branch 'origin/master' into sean
made lots of little changes

colored borders on each comment, pulled in number of claims and
comments, fixed some styling with tabs page
Merge remote-tracking branch 'remotes/origin/master' into scott

Conflicts:
	ci_application/controllers/pages.php
	ci_application/models/data_model.php
	ci_application/views/pages/home.php
	ci_application/views/pages/homeBottom.php
Merge branch 'master' of https://github.com/ungv/tigerfoobar into scott
Integrated adding new tags to claims and company

(almost done, need small factoring in front and back end)
added tag styling
Merge remote-tracking branch 'origin/master' into victor
commented out not working script
Merge remote-tracking branch 'origin/master' into sean
merged with scott
tried to roll back