Merge pull request #24 from noelmiciano/master

noels changes
test for iphone button change
fix iphone button issue
attempting to fix ios issue
manual merge noels stuff
more merging
fixed merge conflict in styles.less.