added the front end to the repo
Merge remote-tracking branch 'origin/master'
caps suck