Started conversion to bootstrap 3.
Merge branch 'master' of https://github.com/ATNI/the-vault

Conflicts:
	app/views/layouts/_header.html.erb