Initial commit

Finally added all the source code to version control
Merge remote-tracking branch 'origin/master'