minor tweaks
Merge pull request #7 from adamthede/jadeviews

minor tweaks
let's accept some offersgit add .
Merge pull request #8 from adamthede/jadeviews

let's accept some offers!!
resolve conflicts