Navigation
Merge branch 'HEAD' of https://github.com/ralampay/microfinancerails.git

Conflicts:
	app/assets/stylesheets/application.css.scss
	config/routes.rb