Merge pull request #5 from maximeHourtane/master

gfd
col-md-offset
MAJ 31.10.2014 14:12

fixes some errors
Merge remote-tracking branch 'upstream/master'