Adding: notes
Comments and removal of conflict in SQL file
Adding more comments -jc
Reorg
merged with master