Merge pull request #3 from tsclausing/master

Merging front-end into master