main cleanup
reset main file to master
clean up errors - a lack of brackets on an if...else..
add registration images, continue integration
Merge branch 'registrationIntegration'