Started work on the tablet style, mobile view doesn't switch properly on mobile devices(tested). just need to add the desktop view then the inital markup for the navigation will be complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/deployment.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/deployment.xml
login pages set up still need to understand models and classes and how to all them to reduce the number of php files im calling