copy the fiels for the ui-scan branch
add the scan view controller by carl
motify the scan view controller by carl
nothing
Removed the stupid strange file that shouldn't be tracked
gitignore file
Removed the stupid strange file that shouldn't be tracked
Merge branch 'ui-scan'
merge brach ui-scan to master branch
conflict sloved