- Added templating system to the app
resolving merge conflicts
playing around with branches
removing test file
Integrated Jin's and Rahul's code with the HTML templating