Merge pull request #2 from Mayho/master

front end scaffold