Merge pull request #1 from Frank15/master

Added doctype
Merge pull request #2 from Frank15/testing

Merge pull request #1 from Frank15/master