Updating to current version
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By MIchael LeGrand
# Via MIchael LeGrand
* 'master' of https://github.com/brawn/pump_up_the_jam:
  Filling out more of the topic manager database. Dropping manager into scene.

Conflicts:
	unity_project/Assets/BrainJam/Script/Category.cs