made intp page
??? gemfile.lock ???
Merge branch 'master' of https://github.com/arramos84/cs169-group25

Conflicts:
	Gemfile.lock