Commit 013014-2
Merge branch 'master' of https://github.com/mrtcereal/wingman.com

Conflicts:
	sites/all/themes/wingman/wingman.tmproj
Commit-013014-2