viwe
Merge branch 'kamphee' of https://github.com/bteera/estudent.git into
kamphee

Conflicts:
	app/views/index/index.volt
Merge branch 'kamphee' of https://github.com/bteera/estudent.git into kamphee