changes to test stuff
changes...
Merge branch 'master' of https://github.com/clipo/mscamera

Conflicts:
	.idea/workspace.xml
	output/output_0.img
	output/output_1.img
	output/output_2.img
	output/output_3.img
deleted junk
just the pycharm changes