initial commit
merger conflicts
Merge branch 'master' of https://github.com/cdiebold/Goldfinger_iteration2