layout html
Merge branch 'master' into twitterapi
flesh out sudo code for twitter authentication