re-allot
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Website into events