initial commit
Added static files
Conflicts solved