bvbvb
Merge branch 'master' of https://github.com/gr3ggz/electropose

Conflicts:
	index.php
	json.php