works - do not touch
works - do not touch
Delete .gitignore.orig
Delete .gitignore.bak
Delete app_log-10-24-2014.log
Delete app_log-10-26-2014.log
Delete app_log.log
Update .gitignore
add chenge order functions
Merge branch 'hash' of https://github.com/nromanen/Ch-025 into hash
add chenge order functions
Merge branch 'master' of https://github.com/nromanen/Ch-025 into hash

Conflicts:
	SSEL/app_log.log
	SSEL/src/main/java/com/softserve/entity/Subject.java
	SSEL/src/main/java/com/softserve/entity/User.java
	SSEL/src/main/webapp/WEB-INF/spring/security.xml
	SSEL/src/main/webapp/WEB-INF/tiles/pages.xml
Merge branch 'hash'

Conflicts:
	SSEL/src/main/java/com/softserve/controller/GuestController.java