test push shany
test push shany
test push shany
C'est normal

Conflicts:
	Nextwatt/application/views/test.php