Committing before the merge
Merge branch 'master' of https://github.com/anotheranshu/thacks2014
Added more views!