initial commit
commented code
Merge origin/master