login module fixed
Merge branch 'master' of github.com:anetfreak/tackit
index
Merge branch 'master' of github.com:anetfreak/tackit

Conflicts:
	WebContent/WEB-INF/jsp/index.jsp
comiit