readme update
usermanual commit
Updated Design Doc Revision History
Merge pull request #254 from graemesmth/master

Updated Design Doc Revision History
Merge branch 'master' of https://github.com/firethanatos/java into firethanatos-master

Conflicts:
	docs/userManual.tex
placeholders
update readme
added the extra screens that were missing
Merge pull request #256 from itpun/master

added the extra screens that were missing and fixed DP table