Merge pull request #2 from thecristen/frontend

Frontend