update loyalty
Merge branch 'master' of https://github.com/rikhiljain/nikrik

Conflicts:
	doc/Rails_Commands_by_rikhil.txt