first commit
second commit...maybe?
added ALL the files
Merge branch 'master' of https://github.com/maroonmicron/class_directory
merging jess and becca