Merge branch 'master' of https://github.com/yokesh28/mmrf-beta.git

Conflicts:
	css/style.css
	projdetail.php

Signed-off-by: janani <janu.vu@gmail.com>
jjMerge branch 'master' of https://github.com/yokesh28/mmrf-beta.git