first draft
Merge branch 'master' of https://github.com/brunovinicius/ECET-2014-MODERN-WEB-APPS