updated manifest
sup
stuff
Merge branch 'master' of github.com:hbradlow/nsagoggles
merge b/c