first commit
Merge branch 'master' of http://github.com/AyrtonStout/Edumacation

Because it wasn't letting me do it