merge
Correct error javascript on home
Correct sticky header
little display bug
merge
Merge branch 'development' of http://brinbois@github.com/brinbois/Sick-Beard.git into development
Merge branch 'development' of
http://brinbois@github.com/brinbois/Sick-Beard.git into development
Merge branch 'development' of
http://brinbois@github.com/brinbois/Sick-Beard.git into development
Merge pull request #91 from brinbois/development

Correct sticky header
Merge pull request #93 from sarakha63/development

Development