added margin to footer
merged something
lkj
Merge branch 'develop' of http://github.com/purdue-epics-ims/ims2014 into develop