Added some things

Merged the AP folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md