working on getting image previews of links and storing them to a local file --[WIP]
Merge branch 'master' of http://github.com/ReadUpCode/readup

Conflicts:
	package.json
using Q to properly set title based on grab from page, then taking posting to database using this title, then taking screen grab and saving that to file with id of item as name of png file
Merge branch 'master' of http://github.com/ReadUpCode/readup
merging changes of routes and updating package.json
handling merge conflict
adding deleted files
adding image files and bootstrap file
handling merge conflict
Merge pull request #31 from BrettHoyer/master

handling async calls on server to get item photos and titles
merged with upstream for brett's changes with titleMerge branch 'master' of https://github.com/ReadUpCode/readup into new_css

Conflicts:
	public/partials/tag_view.html
latest changes
fixed error in extend syntax
added so phantom can put images somewhere
added in links file
took out ng-click while we're still using fake data