Add Track2 info and styles to Studygroup page
merge in newest changes, fix conflict in studygroup.html.erb
Merge pull request #23 from afshinator/dev

Merge stuff