pre-shaastra
added search beta version
Merge branch 'master' of https://github.com/ShaastraWebops/frontend
added search beta version
Merge branch 'production'

Conflicts:
	projects/main/php/pages/pre-shaastra.php
Merge branch 'production' of github.com:ShaastraWebops/frontend

Conflicts:
	projects/main/php/misc/pre-shaastra/lectures.html
Fixed soem stuff