Initial Commit
Merge branch 'master' of github.com:drewminns/week6-remotecontrol

Conflicts:
	index.html
	styles/less/includes/mixins.less
	styles/less/includes/typography.less
	styles/less/main.less
	styles/main.css