Created swap_form and modified style.css
Merge branch 'master' of https://github.com/MyPlanetFruitloops/PinkGrapefruit

Conflicts:
	public/css/style.css
	public/views/swap_form.ejs
Merge branch 'master' of https://github.com/MyPlanetFruitloops/PinkGrapefruit