Merge pull request #18 from mabalaski/master

Added Instructor + Login
Changed Revision History to match requirements
Added Activity UI section

Renamed Assignment to Activity and added Creation/Modification section for UI.
Merge pull request #19 from graemesmth/patch-1

Added Activity UI section
Clarified Assistant Admin functional reqs
Merge branch 'master' of github.com:Donnervoegel/java
updated UI for course adding
Merge pull request #20 from itpun/patch-1

updated UI for course adding
Added information to Non-functional reqs on User Base numbers

- We are assuming a max load of up to 400 accounts registered.
Merge branch 'master' of github.com:Donnervoegel/java
added Deleting a course function
Clarified Assistant Admin functional reqs
Merge branch 'patch-2' of github.com:itpun/java into itpun-patch-2

Conflicts:
	docs/projectSpecs.tex
Updated minutes of the meeting

Added more minutes of the meeting, fixed my UI portion
Altered Ian's additons to make Spec compile
Merge branch 'master' of github.com:Donnervoegel/java
Fixed PDF breaking bug
Cherry-picked Stephen's changes - closes #22

- Had to resolve some conflicts manually
Edited Activity Creation/Modification UI

Removed list of activity management fields from UI mockup and referenced appropriate section from requirements. Added activity details "activity description" and "test input and output files", where appropriate.
Style formatted the test-suite section

formatted as per markus' style spec