Changing new in 2
Merge branch 'master' of github.com:jasonlotito/lvgit

Conflicts:
	new.php