init_b
init master
Merge branch 'dev'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/liaroy/testttu