Add disclaimer
Reapply bundle.js
Merge pull request #9 from rice-apps/disclaimer

Disclaimer
Merge remote-tracking branch 'origin/master' into slider

Conflicts:
	app/static/css/base.css
	app/static/js/bundle.js