concepts.docx
join
Merge branch 'master' of https://github.com/galgreshler/Jamstars
Changed wooden background
Working on login system with Facebook
Got to quite a steady state in the login system
Replacing DB
merged gitignore
Merge branch 'Gal' into Nir
Changes to DBWrapper
Changes to DBWrapper
Working on Login system
Merge branch 'master' into Gal
merged Gal
Started changing get_data
Merge branch 'master' of https://github.com/galgreshler/Jamstars
Login system almost completed
Merge branch 'Gal'

Conflicts:
	DBWrapper.php
f
fixed