did all the things
Merge pull request #20 from wolves-2014/jordan-richard-frontend

did all the things