Merge pull request #1 from katielmeyer/front-end

Front end
Merge pull request #2 from katielmeyer/front-end

Front end
Merge pull request #1 from sea14/front-end

Front end