first commit for ProximityVPS.com - initializing
resolving conflicts and merging master to gh-pages
changing pricing
changing some files around - changing features, fixing typos, changing pricing. Adding blank pages for about/contact forms
testing
idk
merging
fixing merging issues, basic