reorganized files and started version 2
Merge branch 'master' of github.com:ashleyng/OC_database