added from git ignore
Added content to gitignore
Test
Fixing conflict
Fixing conflict
Fixing conflict
Added index page
Adding assests
resolving confilcts
resolving confilcts