users
Merge branch 'master' of http://github.com/diegoduncan21/Neatics into paulo

Conflicts:
	users/urls.py
	users/views.py

Changes to be committed:
modified:   Neatics/settings.py
new file:   users/models.py
new file:   users/static/js/index.js
new file:   users/templates/base_users.html
new file:   users/templates/index_users.html
new file:   users/templates/registration/login.html
new file:   users/templates/registration/register.html
new file:   users/tests.py