Merge pull request #10 from adslaton/addev

updating readme conflict
Merge pull request #12 from adslaton/addev

Adding html/images/css for the security awareness page
Merge branch 'dev' of https://github.com/adslaton/html into addev
Adding the whoweare html and css