Merge pull request #3 from jpk1215/frontend-os

Frontend os
Merge pull request #4 from jpk1215/frontend-os

Frontend os
style edits and using $log
Merge pull request #5 from jpk1215/cleanup

style edits and using $log
solved merge conflicts