git ignore 설
gitignore
Start implementing camera module (appropriately oriented)
pseudocode blocks added for basic camera module, still working on orientation problem
Merge remote-tracking branch 'origin/android_eclipse'

Conflicts:
	colorblind/.classpath
	colorblind/project.properties