Merge branch 'development'
modify links
modify margin on tablet/palm
add new to ruby?
add tags
Merge branch 'master' into development