first commit
Merge branch 'master' of github.com:neagle/amp-styleguide

Conflicts:
	README.md