aa
Merge branch 'master' of https://github.com/jord14k/ways

Conflicts:
	ways.suo