added Makefile.am
Merge branch 'master' of github.com:hitchiker42/school-code