Merge branch 'master' of https://github.com/Odingod/Spaceapps

Conflicts:
	json_parser.html

Signed-off-by: Heikki Pulkkinen <heikki.j.pulkkinen@gmail.com>