initial
Merge branch 'master' of github.com:pxlpnk/ada2

* 'master' of github.com:pxlpnk/ada2:
  Initial commit

Conflicts:
	.gitignore