/index and /index/expand now have different things. Also got the graph and add button to both be on the same page
Merge branch 'master' of https://github.com/cs147win2014/project