NOMR
Merge branch 'master' of https://github.com/esvepecko/Astro

Conflicts:
	README.md