fixed profile page and password update
Merge pull request #19 from euglazer/edit_profile_fixed

fixed profile page and password update
added search function, added username at top
Merge pull request #20 from euglazer/hashtag

added search function, added username at top
Merge branch 'master' into profile

Conflicts:
	app/controllers/twitter_controller.rb
	app/views/feed.erb
	app/views/profile.erb