test

https://gist.github.com/inossidabile/442efd0b9bd17cc381c1
Merge branch 'master' of github.com:r72cccp/test20131212

Conflicts:
	README.md