Merge branch 'stage'

Style changes for footer
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage'
Merge branch 'stage', remote-tracking branch 'origin'
Merge branch 'stage'
Merge branch 'master' of heroku.com:white-sparrow
updated info
updated info
updated info
changed my presentation
content stuff
Merge branch 'master', remote-tracking branch 'origin' into stage