Nothing yet
Merge branch 'master' of http://github.com/isenseDev/rSENSE into HM_Fix_File_Upload
Adding a privacy policy on new users page.
Adding a link to the privacy policy in the footer. Made the privacy policy a partial so that if it changes it only has to change in one place
Adding a functional test to make sure the page loads.
Merge branch 'master' of git://github.com/isenseDev/rSENSE into privacypolicy
Add Rubocopy; Fix a million style issues.
Fixed with a simple html trick
Update Rubocop output format to figure out what's up with Travis.
Modify Rubocop config to ignore vendor subtree.
Modified general structure and behavior of virtual fields
Merge remote-tracking branch 'upstream/master' into jp1387
Merge pull request #1406 from jdalphon/privacypolicy

Privacy Policy
Removed accidental comment
Merge remote-tracking branch 'upstream/master' into jp1387
Merge branch 'master' of https://github.com/isenseDev/rSENSE into rubocop

Conflicts:
	app/controllers/home_controller.rb
	config/routes.rb
Fix Jim's style violations.
Make rubocop fail.
Now make it not fail.
Remove some silly puts lines.