OrginalCode

This will be our original code
Merge remote-tracking branch 'origin/master' into fangworking