Idsahdousaoudhasis
Merge branch 'master' of https://github.com/d2chau/IOT

Conflicts:
	index.php