First commit - first two things complete
2
Merge branch 'master' of git://github.com/wild-endeavor/prep_aa

Conflicts:
	.gitignore