add
add
Merge branch 'master' of https://github.com/vineetma/smax

Conflicts:
	src/com/dkt/smax/DaySchedule.java
	src/com/dkt/smax/Student.java
added