More comments
Merge branch 'master' into content-types
More comments
Adds tests for current Content-Types served
Merge branch 'content-types' of https://github.com/timothy-r/Photos into content-types

Conflicts:
	app/controllers/PhotoController.php
Sets json content type when requested to view photos
Adds json response data for view Photos
Adds json data for view photos
Adds a json view for photos
More comments
Adds tests for current Content-Types served
Sets json content type when requested to view photos
Adds json response data for view Photos
Adds json data for view photos
Removes url generation temporarily
detected bug with new Photos view for json
Sets json reponse content type correctly