Create Meeting Agenda Mar 7.md
Added database management mockup
Merge branch 'master' of github.com:Donnervoegel/java

Conflicts:
	docs/userManual.tex
Merge pull request #82 from firethanatos/master

Added database management mockup
Fixed spelling mistakes in Project Specs
Update Meeting Agenda Mar 7.md
Update Meeting Agenda Mar 7.md
Merge pull request #83 from Contramalgra/patch-1

Minutes - March 7
Added System Admin iamges for user amnual
Merge branch 'master' of github.com:Donnervoegel/java
Merge pull request #84 from firethanatos/master

Added images and edited user maual additions
Altered UI Mockup file filenames

- Changed three files to match the camalCase naming standard.
Minor formatting and spelling tweaks

- If you keep your line lengths to under 80 characters, it makes it easy to view
  diffs, etc., in one nice block in multiple applications.
Added Activity Creation to User Manual

Started detailed Activity Creation in User Manual. Added associated
images for Activity Creation.
Added Activity management view
Merge pull request #87 from Contramalgra/patch-1

Added Activity management view
Merge pull request #86 from graemesmth/master

Added Activity Creation to User Manual
File renaming/deleting - fixes #88

- Removed two unneeded files
- Changed the names of two folders
- Backups made by emacs (files ending in ~) will be ignored now
Fixed Landing Page Leftovers
Fixed usermanual images ref

PNG_Renders was renamed to pngs
I fixed all the references so everything should load properly.