Merge pull request #19 from adlnet/master

get adlnet master
Fixed a couple of formatting problems I created
Merge pull request #132 from garemoko/notes

Fixed two formatting issues