working in seperate branches for now
Merge branch 'master' of github.com:davidnuon/metermaids
initial commit
updating projects
new requirements
basic chat server in need of templates
Merge branch 'markup' of github.com:davidnuon/metermaids into markup