adjustment of uip_conf_buffer_size to 240 (wonders why change not there already....)
updated .gitignore
Merge branch 'master' of github.com:bipson/contiki

Conflicts:
	.gitignore