armv7
Merge branch 'master' of https://github.com/devmario/touched_cpp

Conflicts:
	json-cpp