Merge remote-tracking branch 'upstream/master' into namespacing
Change from Maqaw to Maqaw Testing instance
Display external CSS stylesheet
Change username to email
Remove stray newline
Remove filled in email/password values
Merge pull request #44 from cvuong/namespacing

Namespacing