Merge branch 'master' of github.com:Fishgate/isa_new
Merge branch 'master' of github.com:Fishgate/isa_new
Setup post type for Staff, need to loop through it for the front end.
Merge branch 'master' of github.com:Fishgate/isa_new

Conflicts:
	htdocs/wp-content/themes/ISApress/library/css/ie.css
	htdocs/wp-content/themes/ISApress/library/css/style.css
Installed and did a bit of setup for the WP user frontend plugin, no idea what im doing. Also a new database dump.
Merge branch 'master' of github.com:Fishgate/isa_new