added album file, and other work
added add views
super mega merger
Merge pull request #6 from Tigerryttaren/development

Development