added loader and fixed head from conflict
Merge pull request #2 from jpk1215/frontend-os

added loader and fixed head from conflict