rm pro.user
Merge branch 'master' of https://github.com/kuntae/shellusb

Conflicts:
	shellusb/ShellUSB_v0_5/ShellUSB_v0_5.pro.user