test
add here in home.html.erb
Merge remote-tracking branch 'origin/master'
add here in home.html.erb
add here in home.html.erb
Merge remote-tracking branch 'origin/master'
add here in home.html.erb
remote compass
add a sample form for get and simple search
add a search model to handle the search
add a trip model
must add a category type
add stuff
add stuff
schimbari
schimbari
schimbari
schimbari
structure updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/shared/_footer.html.erb
adaugat reset & variabile in css
header, background si search
header, background si search