Added preliminary buttons to home page
Fixed merge conflict
Merge pull request #179 from radicalsauce/master

Added control panel to analysis page