commit
Let's see and hope!
Merge branch 'master' of https://github.com/teamknowledgemap/KnowledgeMap

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/bootstrap_and_customization.css.scss
	app/controllers/wikiparse_controller.rb
	app/views/layouts/application.html.erb