desktop wallpaper and admin pic changed
Merge branch 'master' of https://github.com/dhruvagarwal/techweek-13

Conflicts:
	calendar/style7.css
	calendar/winbar.html
background image added and admin pic added