I am done
Merge branch 'master' of https://github.com/nickeblewis/nfoliojs

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/photos.js
Merge branch 'master' of https://github.com/nickeblewis/nfoliojs

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/photos.js
Merge branch 'master' of https://github.com/nickeblewis/nfoliojs

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/photos.js