Removed git conflict markers that seems to have been introduced from merge with angular branch a while back.
Merge pull request #5 from maljub01/master

main.css had git merge conflict markers