potali-flagfeature work in progress
potali-5-1 flag feature in progress
potali-master document.rb to resolve issue constantname error
potali-flagfeature completed
potali-flagfeature space removed
potali-flag feature completed
potali-flag feature test in progress
potali-flagfeature view testing of flag feature completed
potali-flagfeature testing blocked completed
merge issue resolved
Merge branch 'master' of https://github.com/mdk199/rorproject into potali-flagfeature

Conflicts:
	app/views/layouts/dashboard.html.erb
	spec/features/admin_spec.rb