[development initial_setup] Fixes the Error.
[development initial_setup] Fixes the Error.
Merge branch 'development' into initial_setup

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'initial_setup' of github.com:Kedarnag13/mrug into initial_setup

Conflicts:
	app/assets/stylesheets/application.css
Merge pull request #50 from Kedarnag13/initial_setup

[development initial_setup] Fixes the Error.