Added a page
Merge branch 'master' of github.com:smayoorans/myschool

Conflicts:
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml