Reformatted and positioned.
Merge branch 'dannyalxndr' of github.com:hipsterwannabe/babytracker into ashwebb
Repositioning.
Merge branch 'master' of github.com:hipsterwannabe/babytracker into ashwebb

Conflicts:
	app/views/bottle.blade.php
	app/views/breast.blade.php