working on the code

getting the code switched around to new app
week 1 complete

week 1 project is complete
added CSS
added HTML
Merge branch 'week-1-dev'
Merge branch 'master' into gh-pages
updates

needed to merge the branches
Merge branch 'week-1-dev'
Merge pull request #1 from o61839/week-1-dev

Week 1 dev
Merge branch 'master' into gh-pages
Merge branch 'master' of https://github.com/o61839/ASD_1309
Merge branch 'master' into gh-pages