Finall
Merge https://github.com/flipflopapp/SilentNinja-Website

Conflicts:
	aboutus.html
Second video added
Merge pull request #3 from vipulsaxena/master

Merge changes from Vipuls fork