Fixed server issue
Merge branch 'website' of https://github.com/gabdallah222/MadProps into website

Conflicts:
	server.js