hahahahaha altera
Merge branch 'master' of github.com:yugom/test

Conflicts:
	yugo.txt