Add some basic styles
Update styles
Add jquery 1.7
merge conflicts
Merge remote-tracking branch 'origin/master'