Merge pull request #10 from theresaanna/master

First front end merge