dont pull test
Merge branch 'master' of https://github.com/mmanning21/lmi-library

Conflicts:
	styleguide/styleguide.html