New Changes
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb

Conflicts:
	assets/styles/nascop.css