Initial commit
Merge branch 'master' of https://github.com/sermanet/OverFeat

Conflicts:
	overfeatcmd
Merge branch 'master' of https://github.com/sermanet/OverFeat
OverFeat v03-5
Merge pull request #1 from zhongwen/master

fix bugs in API/python
Merge branch 'master' of https://github.com/sermanet/OverFeat
Epic git merge fail...

Conflicts:
	API/python/sample.py
	API/python/setup.py
	CHANGELOG
	bin/linux_32/overfeat_batch
	bin/linux_64/liboverfeat.a
	bin/linux_64/overfeat_batch
	bin/linux_64/overfeatcmd
	bin/macos/overfeat_batch
	src/overfeat_batch
	src/tools/ppm.cpp
Merge branch 'master' of https://github.com/sermanet/OverFeat
Epic git merge fail...

Conflicts:
	API/python/sample.py
	API/python/setup.py
	CHANGELOG
	bin/linux_32/overfeat_batch
	bin/linux_64/liboverfeat.a
	bin/linux_64/overfeat_batch
	bin/linux_64/overfeatcmd
	bin/macos/overfeat_batch
	src/overfeat_batch
	src/tools/ppm.cpp
Merge branch 'master' of https://github.com/MichaelMathieu/OverFeat

Conflicts:
	bin/linux_64/liboverfeat.a
Merge branch 'master' of https://github.com/MichaelMathieu/OverFeat

Conflicts:
	bin/linux_64/liboverfeat.a
Merge branch 'master' of https://github.com/sermanet/OverFeat
Clean commit