updated memo. final commit
Final commit
now html5
Merge branch 'master' of git@github.com:eklu/com381
merging