update
Merge branch 'develop' of github.com:weskor/Flex into develop

Conflicts:
	wp/wp-content/themes/flexwrapp/assets/css/style.css
Not the prettiest ipad page, but it'll do