synching with home comp
fixing
fixing conflict
text
Merge branch 'gh-pages'