styles n shit YO
Merge branch 'master' of https://github.com/namwen/mad-decent-crypto

Conflicts:
	.DS_Store