Profile page changed,Blah
Merge branch 'master' of https://github.com/VipulSarin/BlrCafe

Conflicts:
	CafeProject/db.sqlite3