updated gitignore
Merge branch 'master' of https://github.com/wmarshall/autowub.git
Merge branch 'master' of https://github.com/wmarshall/autowub.git
(Probably completely wrong) attempt to set timestamp
Merge branch 'master' of https://github.com/wmarshall/autowub.git

Conflicts:
	src/autowub/Song.java
	src/autowub/SongRenderer.java
Merge branch 'master' of https://github.com/wmarshall/autowub.git

Conflicts:
	src/autowub/SongRenderer.java
Merge branch 'master' of https://github.com/wmarshall/autowub.git

Conflicts:
	src/autowub/Song.java