Merge pull request #5 from Donnervoegel/master

Pull request
Updated Data Persistence in response to TA comments

For the 5th time...
Merge pull request #119 from Contramalgra/master

Updated Data Persistence in response to TA comments
Added MarkShark logo to README
Changed the order of text and image in README

- Of the MarkShark logo, that is.
Added rough AccountAccess class

Built a rough version of the class to access accounts using the JDBC SQL
driver. This class is not at all comprehensive or completely functional, but
it provides general functionality for accessing and modifying our project
database.
Added gui startup folders

Hopefully this works
Added landing page Admin, Instructor, sys admin Test
Merge pull request #121 from itpun/master

Added landing page Admin, Instructor, sys admin Test
Removed redundant landingpage
Added main class - MarkShark.java
Altered gitignore so .class files won't be tracked
Moved gui files and updated netbeans project
Merge branch 'master' of github.com:Donnervoegel/java

Conflicts:
	.gitignore
Extra NetBeans files

Added extra netbeans files
final addition before addition of gui elements
Merge pull request #122 from firethanatos/master

Added general type classes
Changed the DB access to group username/pw
LoginScreenTest added to test page problems
gitignore
Merge pull request #124 from itpun/master

LoginscreenTest added to test page problems