test branch
more
Resolve conflict
next version
Merge branch 'master' of https://github.com/yyyar/todowebapp into mytest

update to new version

update to new version
Adding form validation
remove bin files
some changes
Merge branch 'mytest' of https://github.com/yyyar/todowebapp

merge branch
remove readme
Merge branch 'master' of https://github.com/yyyar/todowebapp into stas

Conflicts:
	src/main/java/ua/od/hillel/todo/controllers/UserController.java
	src/main/java/ua/od/hillel/todo/dao/TODODao.java
	src/main/webapp/WEB-INF/pages/user/register.jsp

merge conflicts
add 404 error page
Merge branch 'stas' of github.com:yyyar/todowebapp