Merge pull request #103 from RightpointLabs/Front-End

Front end
Merge branch 'master'