Deploy to Heroku
d
d
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/img/nav-icons/about-us.png
	app/build/img/nav-icons/clients.png
	app/build/img/nav-icons/contact-us.png
	app/build/img/nav-icons/demographics.png
	app/build/img/nav-icons/design.png
	app/build/img/nav-icons/dribble.png
	app/build/img/nav-icons/home.png
	app/build/img/nav-icons/iphone.png
	app/build/img/nav-icons/news.png
	app/build/img/nav-icons/radio.png
	app/build/img/nav-icons/reddit.png
	app/build/img/nav-icons/sports.png
	app/build/img/nav-icons/title.png
	app/build/img/title.png
	app/build/styles/app.css