spell wizardry
WIZAARD
Initial commit
make changes??
annotated code
update readme
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/students/search.html.erb