initial commit
Merge branch 'master' of github.com:mgriffeth/Front-End_Homework
fixed