added footer
Merge branch 'master' of https://github.com/debugsociety/debugacademy into allwork

Conflicts:
	sites/all/themes/theme1/css/theme1.css
Merge branch 'master' of https://github.com/debugsociety/debugacademy into allwork
theming corrections
new feature
color changes and styling
Added Features Extra module
Added custom module directory, and began first module
Updated debug S module with a functional hook
Finished debugsociety demo module and committing devel module as well
Merge branch 'everyones_work' of https://github.com/nagat/debugacademy into nagat_pull
Fixed spacing issues in header
Moved header pieces into header div for theme 1
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork
Merge pull request #12 from malikkotob/features-extra

Added Features Extra module to export blocks in features
Merge branch 'theme1' of https://github.com/ahmedbendary/debugacademy into ahmedswork