old primer file removed
trying to set up primer page
linked up main page and questions. Trying to implement primerCheck in with question page
Attempt to get the web page function with primerCheck script. Failed
page now receives primer info. Need to add alerts depending on whether answer is correct or not
page now receives primer info. Need to add alerts depending on whether answer is correct or not
fixed silly branch/merge mistake
Pop up box with validation working now. Need to populate some pages and re style some of the pages as they are basic but function correctly
Pop up box with validation working now. Need to change details in some pages and re style some of the pages as they are basic but function correctly
Merge branch 'master' of https://github.com/1101811b/TeamQProject into primerBranch

Conflicts:
	proto/primer/primerCheck.py
	proto/primer/primerMikey.py
	proto/primer/proto/primer1.py
	proto/primer/proto/primer2.py
	proto/primer/proto/primerMikey.py
	proto/proto.db
Merge pull request #16 from 1101811b/primerBranch

Primer branch