Merging package.json file
Merge branch 'master' of http://www.github.com/glimmerlabs/MathOverImages
Add 404 catching function
Add README link to DEVELOPERS
Merge branch 'master' of github.com:glimmerlabs/mathoverimages

Conflicts:
	Site/app/routes.js
changed colors on everything
Distribute require statements
Merge branch 'master' of github.com:glimmerlabs/mathoverimages
changed more colors
All images now linked to users through the albums tab in 'All my Images' button
Merge branch 'master' of http://www.github.com/glimmerlabs/MathOverImages
Fixed routes to include 'require' when calling on function
fixed syntax error in saveimage
Merge branch 'master' of https://www.github.com/glimmerlabs/MathOverImages
Add 404 page sketch
added support for constants in workspaceToJSON
edited constructors.addVal

added support for constant values
changed indents in constructors to 2 spaces
updated funBar buttons
Add beginning of 404 error handling.
Merge branch 'master' of github.com:glimmerlabs/mathoverimages