added file struture
added basic html
merge conflict
setting up angular module