Just checking
Merge branch 'master' of https://github.com/mitaliswain/WMS

Conflicts:
	Gemfile
fix
Merge branch 'master' of https://github.com/mitaliswain/WMS
commit from windows
change
change
windows 4
fix windows
merged