Rebase Master and Initial assignment3 Commit
Assignment3 done.
Merge branch 'assignment3' of https://github.com/LyqSpace/codebase into assignment3