Large restructring of views to better follow rails style
Merge branch 'master' of github.com:stephhuiiii/Evolve