Mergy Merge
Merge branch 'master' of https://github.com/guts2014/Geeksoc.git
Merge branch 'master' of https://github.com/guts2014/Geeksoc.git
Pushy much
Merge branch 'master' of https://github.com/guts2014/Geeksoc.git

Conflicts:
	src/org/geeksoc/guts2014/Section.java
	src/org/geeksoc/guts2014/Workspace.java