wiki
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
updated
requirements
Merge remote-tracking branch 'upstream/master'
added wiki
Merge branch 'jvalansi/master'

Conflicts:
	.gitignore
next merge stage