foot
Merge branch 'master' of https://github.com/adishr09/JMDET.org

Conflicts:
	jmdet.org/css/style.css