Initial commit
Initial commit
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Merge branch 'master' of https://github.com/crisstanza/memorize
Delete js.js~
Update RankingDAO.php
Instruções para configuração do ambiente local.
Instruções para configuração do ambiente local.
Merge branch 'master' of https://github.com/crisstanza/memorize

Conflicts:
	README.md
Update README.md
Update README.md
Update index.html
Update index.html
Merge branch 'master' of github.com:crisstanza/memorize
Merge remote-tracking branch 'origin' into gh-pages