initial commit
Merge https://github.com/nicholaslum444/CS2106-Project-2