responsive layout
Merge branch 'master' of ssh://github.com/dtulibrary/kenkyu

Conflicts:
	app/assets/stylesheets/application.css.scss