Adding initial files

Signed-off-by: Simarpreet Singh <s244sing@uwaterloo.ca>
fixing merge issues

Signed-off-by: Simarpreet Singh <s244sing@uwaterloo.ca>