why I have to commit this first?
Merge branch 'master' of https://github.com/bruce30262/tube

Conflicts:
	nbproject/private/private.properties