Merge pull request #4 from thisispayal/master

merging support html and Dan's features file path fixes
added greyscale icons
Merge pull request #20 from DSegal92/gh-pages

Added ux elements
overview commit
Merge branch 'gh-pages' of https://github.com/vigilant/marketing-site into vigilant-gh-pages

Conflicts:
	assets/css/styles.css
revert merge
am I still reverting a merge?
now is it working?
Merge branch 'gh-pages' of https://github.com/thisispayal/marketing-site into gh-pages

Conflicts:
	assets/css/jquery.bxslider.css
	assets/css/styles.css
	assets/img/imageshare.png
	assets/img/vigilant.png
	assets/js/header.js
	contact/index.html
	index.html
	pricing/Index.html
DOES THIS WORK?
Merge pull request #21 from thisispayal/gh-pages

I hope I didn't delete the uses with this merge.
trying to revert merges and reset HEAD to somewhere in the commit history.
Merge branch 'gh-pages' of https://github.com/thisispayal/marketing-site into gh-pages

Conflicts:
	assets/css/styles.css
	contact/index.html
	index.html
I think this works now and all is finally right with the world. Still missing some parts of index.
Merge pull request #23 from thisispayal/gh-pages

Commits hopefully resolved the merge issues.
merged changes from vigilant