First night of Hack Princeton. The framework for the server is pretty much complete, now gotta work on implementing particular things like file uploading.
Second day of hack princeton! App.js is almost complete - taking input properly
Merge branch 'master' of https://github.com/chrisgp/Photon

Conflicts:
	app.js
Merge branch 'master' of https://github.com/chrisgp/Photon
Added tesseract photonenglish config file