.
,
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'dev' of github.com:project-fifo/jingles into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev

Conflicts:
	README.md
Merge branch 'test' into dev
Merge branch 'test' into dev
Merge branch 'test' into dev