merge master
seting up index
adding text
minor changes
updated
merge views
fix minor errors
solve conflicts
Merge pull request #9 from heapsource/details

Details