integrating with main site
Merge branch 'master' of https://github.com/ShaastraWebops/frontend

Conflicts:
	personal/rishii/pics/Thumbs.db
	personal/rishii/shows.css
	projects/main/css/shows.css
	projects/main/img/lectures/arogyaswami paulraj.jpg