php
just a bit of php
changes from last night
gitignore
changed the design to look like our new design
new php
php
Merge branch 'Janis'

Conflicts:
	_notes/dwsync.xml
	img/website/candy.png
	img/website/logo.png
	index.php
	js/scripts.js
	style.css
html
updates to the homepag
Merge branch 'master' into Janis