HTML
Merge branch 'master' of https://github.com/brunomperes/fb-hackathon

Conflicts:
	myproject/myproject/database/database.sqlite3
	myproject/myproject/settings.py
	myproject/myproject/settings.pyc
Ajax request for join a game
Merge branch 'master' of https://github.com/brunomperes/fb-hackathon

Conflicts:
	myproject/myapp/templates/myapp/login.html~
	myproject/myapp/urls.py~
	myproject/myapp/views.py~
	myproject/myproject/__init__.pyc
	myproject/myproject/myapp/__init__.pyc
	myproject/myproject/myapp/forms.pyc
	myproject/myproject/myapp/models.pyc
	myproject/myproject/myapp/urls.pyc
	myproject/myproject/myapp/views.pyc
	myproject/myproject/urls.pyc
	myproject/settings.py~
	myproject/wsgi.py~
Changed structure