dev commit after reboot
ANOTHER CHANGE ON DEV
too much caps
forgot to delete a line
Merge branch 'dev'
adding gitignore file, removing First_file.txt from repository (with git rm --cached) and placing filename in gitignore

Signed-off-by: jomarshall <jomarshall@petsafe.net>
Merge branch 'dev'

Signed-off-by: jomarshall <jomarshall@petsafe.net>
Merge branch 'temporary'

Conflicts:
	First_file.txt